fix: derive client IP from trusted proxy hops only - #1399
Open
devflora-princess wants to merge 4 commits into
Open
devflora-princess wants to merge 4 commits into
devflora-princess wants to merge 4 commits into
Conversation
|
@devflora-princess Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
This PR replaces the boolean
TRUST_PROXY_HEADERSbehavior ingetClientIpwith a trusted-hop-count model that selects the client IP from the right side ofX-Forwarded-For, matching Expresstrust proxysemantics. The leftmost XFF entry is fully client-controlled, so the previous behavior allowed spoofing past the admin IP allowlist and per-IP rate limits. The change keeps the default (no trust) behavior of using the socket address, and updates the allowlist middleware and forwarded-header policy doc to reflect the new invariant.Related Issue
Changes
🔒 Trusted-hop client IP resolution
[MODIFY]
src/lib/clientIp.tsgetClientIpnow takes a trusted hop count instead of a boolean.hopspositions from the right ofX-Forwarded-For, so with one trusted hop1.1.1.1, 2.2.2.2yields2.2.2.2.[MODIFY]
src/config/env.ts0(no trust → socket address).[MODIFY]
src/middleware/ipAllowlist.tsgetClientIpso the allowlist decision is made on the trusted-hop-derived IP rather than the spoofable leftmost value.[MODIFY]
FORWARDED_HEADER_POLICY.mdtrust proxyalignment.[MODIFY]
src/lib/__tests__/clientIp.test.tsVerification Results
X-Forwarded-For: 1.1.1.1, 2.2.2.2yields2.2.2.2getClientIpipAllowlistuses the trusted-hop-derived IP0; socket address usedsrc/lib/__tests__/clientIp.test.tsis updatedSecurity and Failure Modes
0hops), behavior matches the pre-existing no-trust path and uses the socket address.0.Non-goals
Closes #1268